Merge from emacs-24; up to r108090.

diff --cc doc/lispref/functions.texi
index ab2789b5e6d7718010de499bb24a5cec7ecda42f,f27277a2a6bbdf5f90f09987e134538843b327e7..9e1d3f9c6ae66dce1b85ce683e95496605469c8b
--- 1/doc/lispref/functions.texi
--- 2/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@@ -1100,8 -1100,9 +1100,9 @@@ named function that you create (e.g.@: 
  any anonymous function that you create using the @code{lambda} macro
  or the @code{function} special form or the @code{#'} syntax
  (@pxref{Anonymous Functions}), is automatically converted into a
- closure.
+ @dfn{closure}.
  
 -@cindex closures
++@cindex closure
    A closure is a function that also carries a record of the lexical
  environment that existed when the function was defined.  When it is
  invoked, any lexical variable references within its definition use the